Fix name, commit latest tweaks