Good commit. Many Fixes!