Reademe changes and some refacoring