added a few tweaks to make it place nice with others