3/3 bugs fixed