Made minor changes to the way component addresses and map swaps are handled.

Signed-off-by: MGZero <steven.calandra@gmail.com>