1 gallon batches are tricky. The full boil is a real pain at such a low volume and I ended up with less wort in my fermentors as well. However, you will find the right temperature to boil at and will eventually get the volume perfect. As for the adding of water, some people have for the 1 gallon...