Fixing problems and adding install functionality