Update 05.08.13 and minor fixes