Improved organization and added help.