Fixed issue with urls and stylesheets option; Fixed some comments; Added tests
Style fixes