Refactor + readme

Refactored some stuff and updated the readme for the last few things I did