Update Source

Update Scripts, several fixes.