fixing remaining critical bugs for 2.0 release part 1 (#132)