some bug fixes and THE STICKMAN