Bug Fix & Rendition improvements.