completed app and fixed bug