small fixes, get ready for the next stage
minor changes to make the 3 layer structure more explicit