cleanup
fix error messages
metadata