Added ability to adjust stroke width
Refactoring and bug fixes