Added Constants; Validate struct sizes
removed TODOs
Connect disk only if magic number is right