some 80 lines fixes