Bugfixes and chaged knife function