little tweaks from raymond