Added newest Fixes from original Repository