13:36

fixed main bugs