major refactoring, removed the boostrap property; preparing for next release, see README.md