Fixing changing structures and lot lot lot lot lot of errors