Update template and bunch of other stuff

Signed-off-by: Jai Govindani <govindani@gmail.com>