Improve comments
Add test craft