A few little tweaks/changes