made App a class
final fixes (hopefully)