Should have fixed some bugs.