apply last fixes
remove testing
Merge pull request #319 from ahilles107/fix_last_things

apply last fixes