Pulled down copy from Arcutech, edits

431