added rjtag part, fixed bad behaviour with falcons

haven't tested that yet, no time, sry :(