Update framework and minor tweeks