bugfixes + removed unused stuff
Merge branch 'master' of https://github.com/jp-ganis/JPS