merge
added eps figure and made references
added new plots + solve error
cite all