latest tweaks from aw bug fixes