Datepicker & Toggle bug fixes. Packaging