syntax fix and including rest of files in working dir