Fixes break/continue handling
Add while