More updates to engine