updated main app and fixed some silly typos