Improvements

Ah ok for later.