more fixes based on @ElDeveloper's annoying comments