fixed missed changed values
attempt to fix async
more updates
Merge pull request #37 from judajake/fix_bugs

Fix bugs