Some more cleanups.
Fixed error in /descend.