More updates, hopefully now working a bit better.