and more error fixing