a few tweaks, remove warnings, etc