Closes #180, #181, #183