addes some fixes