End of 3-27 work

fixed bugs, break still does not work