Fixed random bugs

Working on GVSU laptop