Also i don't think the add and remove commands are working, could be wrong..