fixed includes; drafted BufferedStack suite