Fixed app, removed some loads.
Simplify Returns
Removed some comments
Update function calls