Added obj_text, various improvements