JohnnyFFM some upgrades