0.8.3, updates/optimizations