bug fixes, also stub for editing service metadata