Fixed lots of errors and missing code#396

denzenn wants to merge 2 commits intoagwaBom:mainagwaBom/Assignment_12:mainfrom

denzenn:maindenzenn/Assignment_12:mainCopy head branch name to clipboard