Fixed more bugs
Merge branch 'master' of https://github.com/funcvehicle/swe400