Level 9 added and bugfixes