Fixes #10, fixes #11, along with update

of RHW legacy file.