fix types, build time, aligns