Cleanups & added installer