Resolved a number of rendering bugs and speed