Possibly fixed a few things?