A huge batch of non-organized improvements and fixes trying to get to
finished Beta mode.
Add templates missed earlier