Fixed a warning in libsmo, some work on the structure