fixing and small changes