Added a main(args) at the top
Tweaking small things