2 bugs resolved