More bugs

tweaked more bugs...