Worked on rally code, fixed some bugs