fixed + added some stuff