0.7a3

diagnostics in macro have been improved