Bringing basic structure in line with kcb_skel
Fixing one tag and adding a new one