added 2 installation procedures + fixes