Small disney material improvements and fixes #2.