few tweaks from nick