fixed bugs
added some error handling
merge project.properties...