Fixed some stuff, added wrong properties files - these need to be
deleted!