Fixed inconsistencies, giving up on searching for more :|