minor changes, made some tests
backed up