updated files, cleaned up