Fixed -few bugs