closes #150
small fixes