Last tweaks
Fixes, tweaks
Added todo