some more sanity
Merge branch 'working'