first iteration + some fixes in terminology

Note that I actually guessed some of the things you see here :)

I'll fix this.