made everything work pretty much