more Bugs

fixed few bugs this time