fixes, app functional now