Fixes
minor tweaks