More updates, lots of work done