Fixed more add bugs