Tweaks and updated terms and condition