incorrect pwd fix
Various fixes and additions
Various additions
Merge branch 'development'