Improving includes + updating the readme