Structure some things and misc changes