Sass errors now showing up again
Fixed some todo's