Implementing properties files and minor fixes