Cleaned up unite, misc tweaks