Closes #192

and 193-197, 213. Re-commit after fresh branch following merge problems