fixed remaining issues with abstracting Stick