adding installation and minor cleanup