The Moontower Comedy & Oddity Festival already announced a large chunk of its lineup a at the top of the year. They’re now just piling on the goodness with the announcement of two new headliners. Podcaster extraordinaire Marc Maron and SNL alum Fred Armisen have been announced as additional headliners. Armisen’s musical doppleganger Ian Rubbish will also make an appearance at the festival. So with Armisen, expect some musical elements to his performance. Also added is a third show from Aziz Ansari who has shows as part of the festival’s ticket package. Previously announced headliners include Dennis Miller, Kids in the Hall, Mike Birbiglia, Demetri Martin, Hannibal Buress, Maria Bamford, and J.B. Smoove. The festival is presented by the Paramount Theatre and will take place in downtown Austin, TX April 23-26.