Some cleanup and updating
v3.0.04.01