bug fix and spring update