Added drawing in of borders (buggy though)

fixed some potential bugs
Completed tooltips

close #71
close #66