Some bugs resolved.