More bug fixes.
Added support for multiple structures per command.