fix all current bugs