Readme updated, done some refactorizing.