changed unit calculation of alcohol and did other things
mergermerge merge