Fixing up the App and module sections. Not sure how to formally test them, yet.