break placement
fixed compile errors
more small edits