worked on recurring and fixed some bugs