Drawing tool fixes and patches. 50% working. Still WIP