More work on tutorial and behaviour fixes, integration with package changes