Fixed most issues and should be ready to be presented