Formatting is now consistant. This will be a pain to deal with if there's a merge...
Animation now properly uses speed parameter.