minor changes; test and other stuff