Improvements

See commit log