Changed Select-Fields to Checkboxes; Several Small Fixes