Minor changes. CLOSES #8