A couple tweaks and additions