Fixes #130
Fixes #132
Fixes #129
Fixes #131
Fixes #131
removed commented code.