Cleanups and better installation instructions