Bugs all fixed