fixing up codebase