commit to merge
done merging
tweaked some of the minkowskian bits