skill related bugfixes and improvements