Update

Updated some stuff. Finally.