Fixed projection bug, code cleaning, getting ready for merge with trunk