Merging in Roomon1's structure fixes.