Fixed some render issues and adjusted further more readability.
some comeback fixes before a stable release