fixing a few things that have been bugging me lately ;d