Minor improvements, better tools