1 cache bug fix and 1 js bug fix