Fixes #1: Small updates after full testing of different service types and procedure codes with medicare