Fixed #116: Bootstrap artefacts added to the project. Additional small fixes.