Updated setup script and additional checks