Some much needed updates