Some more modifications.
Still in the middle of heavy changes