Updated files, finishes features, removed debug lines