few tweaks based on friends reviews