tweaks fixes and features