added span classes
sort of fixed meter transform