Fixed some more problems with the order of filters and cleaned up Ini a bit.