fixed some 2pc and split, TODO: merge
Merge branch 'master' of github.com:kghandhi/cmsc23310