Some more changes

Including stuff