Various changes & improvements