various updates
Merge branch 'development'