1.0.4-BETA

Continuing the clean-up and upgrade.