Misc Fixes, selection & style