Refactoring, fixing issues, hunt stuff