Finalized everything except the man page