fixes, moved rendering to Mesh