First crack at hotswapping behaviors (+ some minor cleanups)