More work on tools, edit of puff code