Less Blockyness

Also fixed code I broke...