Bug fixes

Bug fixes because am bad at coding and english