Editor and Game improvements