Last fix

more bugs