fixed a few bugs, improved rendering
more bug fixes