Added substitution limit (3). Fixed minor Manager interface bugs