more data supported, bug fixed, styling