closes #6, some other fixes