Many Fixes!