skull-fill refactor and comments