Small changes and comments
Fix url helper
Some comments
Removed unused blank spaces