Align stuff. Closes #97. Closes #96.