Upstreamedge

Just some minor clean up.
added corexy as an alias for hbot.