start using templates more
fix extension
restore some visuals
more fixing
show client, server and wire
fewer globals