Minor formatting
Abbreviate floor types
Check for missing unit number