General update and minor changes