little tweaks and fixes