Bug fixes + implemented add/rm/print