Fixed some beginning stuff