Added installation requirements + fixes