Added CRC field to SATP segment; several cleanups