fixed a few things3