Improvements, touched on #47