small fixes, remove all @ symbols and notify errors.