Fixed minor issues - Updated dependencies. Prepwork for sandboxing.