Re: Angels
yes, you are right. 
as far as your second question is concerned, shaitaan is made of fire while angels are made of light. during the argument with Allah as to why he did NOT bow down to Adam [a.s.], he said because he was superior to Adam because he was made of fire while Adam was made of clay.
Iblees [the first shaitaan] lived on earth and he worshipped Allah so much that he was taken up to the heavens and he used to teach angels the wisdom/Hikmat.
after he refused to bow down to Adam [a.s.] and thus disobeying Allah, he was condemned and sent back to earth along with Adam [a.s.] to live and be each others’ enemy till an appointed time as a punishment.