Based on the checklist I have, and a vessel I just spoke to a couple weeks ago, it does cover some of what you are referring to. The inspector on this particular vessel spent 8 hours. A large portion of this was spent on the paperwork, SMS, etc., but he also spent a couple hours with their chief engineer crawling around looking for check valves, etc. The fire portion is also covered, especially the CO 2 room, correct signage-follow up signage. We actually had a room built for the bottles, although it sounds like a waiver is possible for that too. Perhaps it depends on who is inspecting you. The alarm panels, shitter system, etc was gone over. We have 40 plus year old tugboat, but we have worked hard and spent a lot of money to come into compliance.