Updated documentation, minor tweaks
Fixed issue where container could be nil