More cleaning up. Fixed some minor errors.
Merge branch 'develop' of https://github.com/marbindrakon/eve-wspace into cleanup
Merge remote-tracking branch 'remotes/origin/cleanup' into develop