still fixing small changes