Several updates and new files for smoother processing