two phase bugs resolved