made some tests, added some features

moved some things around