Shalaalal

Even more fixes