Application and configuration, fixed #2, fixed #3.