Cleaned up some stuff, making more progress on the candlestick stats over time