Finalise settings

Update comments, and finalize settings