Comment cleanup and bumblebee alias updated.