Added checking for transfers into active checks, cleaned it up a bit