cleanup, added wallet functions