tweaks

lots of little tweaks some working, some not.