changes, close to last fixes I suppose