ExerciseBundle all features passing, small fixes, related stuff