new specs

changed object handling, and template handling