Small fix: code quality & portability increase
by using File.seperator
removed/added some todo's