bug fix and aesthetics