Fixed a few bugs

there you