refactor a little, cleanup, fix some display errors