Refinements

closes #35