fixes and little changes