Update 15/03/2013

* Lots of code optimizations and bugfixs