implemented wallet removing, bugfixes