All current bugs fixed