bugs resolved

bugs resolved