More updates for 0.1