Clean up, error fixing.