Removing extraneous files, tweaking some output