Minor bug corrections, updated the EDMX