first iteration + some fixes in terminology

use 2 spaces instead of 4