little improvements on #55