[fix/documentation] some minor fixes and docs brought up to date.
Merge branch 'fix/documentation' into development
[fix/actually-working] fixed screwups
Merge branch 'fix/actually-working' into development