Template updates, ruby fixes, etc.