Various tweaks and additions