final misc changes