fix: smal fixes and bug fix for @ support