Fixed bugs pertaining to unifying ready for the presentation demo next week