replaced square joints for thorn and quill
minor clean up