Fixed file encoding and added two missing components.