some stuff I did last night after getting into a shippy mood