Fixing bugs

god dammit