Various, should close #11 and closes #12

Also completed the generation of LHS, and adjusted a few things