finished fixing problems hopefully