-Various bug fixes
-Improved functions
-ground work for Bootstrap support