-minor bugs
commit before merge with path handler