Added all changes to this branch; ready for merge

Make doesn’t work for some reason because of theos, but I doubt this
will be a problem