* Fix frame rendering
* Small performance improvements