working through broken app bugs
fixing poor merges