07. Academy-Popcorn - some bug fixes