Crafting chip

- Imports/Whitespace cleanup
- bug fixes