Fixed some stuff!