Fixed some indentations, render checks, added a couple more chunks for
testing