0.7a2

(1) diagnostics have been improved
(2) minor fixes