added some more 2d projection code
fixing conflicts