Added default option to exercise select and small fixes