added comments
initial commit
added OPTIONS / names cleanup