Some more changes

Here are some more proposed changes from my alpha 2 examination