fixes on several exercises