Bugs fixed. Done & sent