a few tweaks :rage1: