Clarified and re-shuffled lot's of things

Signed-off-by: Rutger Geelen <rutgergeelen@huangis.com>