Fixed certain parts