add new variables, fix bugs
minor changes, updated readme