added numerous things to make stuff good