Fixed some bugs and pushed changes for today.£