improve debug, improve hungarian notation