fixed some assembly bugs