fixed a lot of things mentioned on piazza