Fixed a number of issues signalled by Marc.#12

davidv1992 merged 1 commit intomainpendulum-project/nts-pool-draft:mainfrom

comments-marcpendulum-project/nts-pool-draft:comments-marcCopy head branch name to clipboard