commit
2nd batch of fixes