Re: Milk and water?
At 12 months, demand-fed babies can still get pretty much all their nutrition and their hydration from breastmilk. But it's a good idea to introduce water so that the baby can get used to that as an alternative beverage. Animal milk is optional as long as you are still nursing frequently, but if you're nursing just a few times a day it's a good idea to introduce some form of dairy (animal milk, cheese, or yogurt) or to offer a carefully balanced diet of fat and calcium-rich non-dairy solids.
Basically, I think you're fine.
Coolest thing my big girl said recently: "How can you tell the world is moving when you are standing on it?"
Coolest thing my little girl sang recently: "I love dat one-two pupples!"