Update for 29.05.2013 & reformat and cleanup some parts