Some fixes and enhancements

For Bootstrap 3.20, I've been using this customized version for a long time with no problems, and I thought I should create a fork and share it with you.