Updates: v1.0.4

Various small fixes