Add stem plot & misc cleanup