Re-factored code a bit, fixed bug with additional nodes not being added to cluster, and allowed more wait time for public IP/ssh availability