More bugs fixed. First task