Fixes #4 Fixes #8. Changed minor var:redraw stuff.