* little tweaks here and there