refactoring marks and comments, correction to make the app work for the presentation