Fixed 3 bugs.
Merged Local with origin