fix all stuff