Minor changes to code, still needs testing on storing information on phone