Several bugfixes
Doctrine Version is upgraded to 1.2.4