0.7 update with fixes, working on 0.8