Lots of small changes and placeholder additions