Merge "Bug fixes, syncronization, and clean up daemon"