Close #50, close #49, close #48

These aren't perfect solutions, but we're in the process.