First draft

- Fixed mistakes, updated old names of stuff