More details on the current stack. Some cleanup.