small tweaks, all seems to be working