refactored bootstraping into one step procedure
minor fixes to code; added some tests