Code

commit: refer to commit template as s->fp