misc alignment issues fixed