Added and changed a few bits