Adding forwardingHandler to the same file; multiple bugfixes