Fixed some structural issues, a little here, little there.