namespace modifications and minor changes