Fixed up the update and some other things :)