more fixes MWAHAHAHAHAHAHAAHAHAA