Finalizing for publish. Add a few extra points