Added logic for full assembly, some textual fixes