Various development support files
Make lining pass