major speed improvments and fixing handling
Merge branch 'master' of github.com:eeue56/Svenum