Performance greatly improved and rendering fixes