Updated with latests from Fitzchak

Merge this one (that includes all Fitzchak branch changes) and I will work from that merge to fix it. In that way we will all be on the same page.