updates and fixedbugs