#52 fixed cosmetic bugs.