More R4 Stuff

Removed TAPI namespace calls (was removed in R4) and fixed some bugs in
my code.