More improvements on #34.