Fix stup and templates issues
fix template issues