MAde some quick fixes to some of the issue this app was having...