stick fixes and test tweaks