Cleanup and make sure we are rendering often enough

Also remove quotation marks from strings