Slight changes & small fixes