Added importAdded / importRemoved to update + minor fixes