Hotfix

Fixed some debug code. Added missing container option code.