made it purty
Fixed #2
Fixed #3.