Edit exercise + minor fixes