Add ISBD alignment, minor fixes