Serious Fixes + App working