Bug Fixes

Added more async methods!
Merry Christmas!
Code refactored
Added comments