finish multi instance support - closes #2