Added 'Action adding' and fixed some bugs