fixes #655
fixes #656
fixes #649
fixes #650
fixes #651
fixes #644
move around stuff, add more links
slight refactor