- a little refactoring, added/finished bootstrap tests