Added terms and conditions and bugfixes