Update support files

Based on feedback from @OliverJAsh and @theefer 
Done