various major webservice changes
cleanup & refactoring