app rework bug fixes