fixed remaining excpetions. closes #218