Fix a few problems that I have

Cancelled - Find more jobs like this here