fixed some bugs, aesthetics, etc