small edit and testing hooks. Closes #1