More updates

Getting close to final major update