moar changes to rendering