whoops! fixed some bugs.