Added energy support for Buffer and fixed direction derps