Added bounce/go through toogle, fixed drawing