Added fixes, install needs to be tested