Added context to temp_nodes. Small fixes.