Add more changes from improvement list