More updates; WIP.