minor fixes. Base Complete.