cleanup
fix version and add headers