started cleanup to four-vectors
more four-vector stuff