Further extended on clarity and added in missing weapon constants.