fixed bugs that make my stuff non-compilable

fixed stuff
Merge branch 'Main' of https://github.com/SP3Team17/SP3 into Main