Updated a lot of stuff.. Duh duh duuuh

#82