Eluna initial push

Also includes a few hotixes done on Zero.