Changed a lot of things

Github was broken and I've done a lot of things in that time.