Update and minor bug fix