get rid of "Read only." comments, add NullLiteral handling
get rid of trailing commit
clean up doctrine helper methods
clean up the custom doctrine api, fix constructors