Fixed more of safwan's terrible mistakes

made it public