symcraft: fixes and refactoring