More updates

Still working on it.