Dev Sync (6)

Optimizations and such.