added table template and other stuff;