fixed some bugs
Merge branch 'master' of https://github.com/dWarf-In-thE-FlaSk/Proj_361
fixed everything hopefully
Merge branch 'master' of https://github.com/dWarf-In-thE-FlaSk/Proj_361