Bugs resolved

.