cleaned references
fixed references, probably final version