Adding brackets template
a few fixes and naming