fixed rendering problem
improving whitespace, and fixing debug