removed more trailhead artifacts
Fixin bugs
reorg