Did some random fixes. Refs #119 @ 2h