More updates

Pretty much ready now