Various fixes. <Sam>
Fixes. <Sam>
Move Candle to right place. <Sam>