made some things better
Don't worry about the merges they're not an issue