fixed + added some