Some cleanup as well as adding helper/info text.