Fixed some stuff and crashed some other things...