fixed deletion etc.