some cleanup and file-updates