Added in-app message; cleaned up other stuff