massive updates. #142 nearly finished, issues updated