Estimated tax penalty

What i understand is if I pay in with my W-2 withholding plus estimated tax at least 90% of current year tax liability, I will not have a penalty.

Also, if I pay in 100% of last years tax liability, I should be okay?  My penalty is calculating based on 110%of last years.  is that based on my agi?