break for switch and some cleanings

second tentative to commit.. the first one failed.