Bug fixes - working on 0.93