Some changes I made and stuff

Hey bro, you should include these changes in your repo so I can delete my fork.