many fixes to rect tool. added modified annotator functions to use container size, rather than window size