third commit for day25, some bugs fixed