added tos and improved other stuff