More updates to everything. Optimizations.