06.05.13 lots of small edits