Fix a bug with $reset-units and clean up a bit

updates for v1.0.3