*fixed a few things*