cosmtetic changes, still errors to fix