some additions for rendering, warning fixes in case classes