fixed rendering and several other additions