closes #1 issue, plus other stuff