Updating and fixing things further.