More minor modifications. Ready for alpha, no storage modified.