add other misc changes