Bugs fix
6hours 179hours total