Fixed bugs and added new !add functionality