More tweaks + fixes