Fixing bugs

fixed!