some minor fixes to avatar and align tool