Alright, fixed some stuff!