Fixes, tweaks and more