Fixes, tweaks + improvements