adds better quit option and namespacing