Found some bugs to fix.