Better handling of the bootstrap script. Fixes #3 #4 and #5