Slight fixes, still not ready.