fixed typo
removed out commented code
changed references to avoid circular dependencies
api changes in creation of containers