Fixed a couple bugs
Merged remote work