almost complete alpha fix
Merge branch 'master' of https://github.com/jjl284/CS4621