Removed more breaks, and some other stuff.