fixed a few things from last commit