added a few little tweaks