first iteration + some fixes in terminology

I followed Dan/Idan.. I'll switch to dictionary.