Improved bracket
Misc updates