Add remaining files, fix spacing in comment tokens