fixed bugs for my local environment