added a bunch of things to support android service calls