addContent and some bug fixes