fixed a few cosmetic bugs