Fixed some bugs before shipping

oops