Merge completed partially.

Tmaze merged to hexag code.
Methods fixed for the merge.
Still pending fixes in strobe for TMAZE.