small changes. prob final commit before sleep