Smarty update
misc update