ENH: Changed border color. Fixed some crash.