Fixed bugs with new bootstrap code
Fixed line endings