Updated options and directory handling
Lots of updates for completeness and clarity