re-arrange tweaks and removal of comments for things I don't intend to use any longer