Update README, cleanup setup