Another bunch of changes, not very good at git :satisfied: