Fixed render bugs and cleanup