Some messy fixes.
Added Argonaut stuff.