That would be right Rossco, Don't be surprised if it kicks some of that out after the first ride. Rule of thumb (on my 84's) is about half an inch under the top of tank is the usually water level (approx half way to the core).
Air normally bleads out ok but when you fire it up remove the cap to see if you have good water flow.
Shane