added absolute paths, few cosmetic changes