better display, bug fixes..