More tweaks and management stuff