buggfixes and uppdated target