Multiple changes (apparently forgot to update github)

Forgot to update github so this is a lot of changes.