small tweaks from AJ