fixed some improveupon related issues