Mass update. Complete reworking.
update 2