extensive changes to most of the functions
Merge branch 'master' of https://github.com/valcu/expp