Fixed some structural things