some fixes and part of next homework