Checked that each URL path works, squashed some bugs!