closes #83  and some fixes for #75