Structural changes finished, Duration handling moved to Beat, minor performance tweaks, bug fixes