Update help message
Simplify use of paths
Rearrange and update vars