little tweaks and debugs