small changes, bugs in changing maps -> delete does not work correctly