Fian ltweaks
Final tweaks