Also look at annualized income for California. That could at least reduce the penalty. I would get clarification about the penalty before filing an amended return.
