better entity fill [closes #8]