Bugfixes, Experimental functions