Fixed bugs, removed references to previous app