buggfixes(still not working)