refactor + fix tapping problems
change wire format to BSON