Adding workout & some bugs...