Add latest features/fixes

Alignment, standalone, tests, etc.