Improved alignment.
Misc. improvements, including new partial _add_hint.
Misc. improvements