-fixed a couple bugs in my last commit