Working on fixing some bugs.