fix lots of stuff + add some IA