Added stuff! Fixed weirdnesses!