clean up imports a little
override Base.display, instead of calling it by hand
add xlim,ylim
merge upstream