fixs & improvements
commit
commit
test

.