Updated Some Code (Testing) + License