Final updates

Final updates before releasing.