Issue21 media

I revised the code of Air.mo and Water.mo.

I also include some "fixme" where I was not sure or where I had questions/suggestions.