Bleeding edge

Tweaks, bug fixes, admin things