refactor and wheel fixes