Various additions & improvements