Add bootstrap and some minor updates on build