updated to official repo/cleaned up bootstrap