issue #19550: First pass bug fixing.
issue #19550: More fixes
issue #19550: Add missing model definitions.
issue #19550: swat.
Merge pull request #80 from jrogelstad/19550

issue #19550: Lots of fixes. Filling out missing parts.