updated block/unblock status, more cleanup