Updated: Dependencies and small cleanup.