Fixes, comments
Tweaks