inl fixes plus some logic fixes