Fixed API and Commented existing files