Lots of updates for v1.0.4