Fixed some stuff from previous version