#52, #39: closes these issues