fixed typo
more detaild default value calculation
fixed bug
more detailed default value calculation / some todos