Fixed bugs, app v. 0.3