Updates for v0.2.0, mainly making more generic