More updates

Just some more updates