misc edits
misc edits again
more tweaks, startng to dislike tabs