commit1

fixed few bugs