Another fix

fixing buggs etc