fix stuff, not complete