Assorted stuff
Updated to new spout api