Fix 2 issues with commit 680e30d8:
1. Need to replace @-code globally, otherwise only the first @-code was replaced
2. Need to strip the leading and trailing @'s from the code before passing to bbs.atcode() - fix for issue #527