setup script now works better