fixing bugs + making app helper