bunch fixes to various functions so they're more consistent and functional
general cleanup and data addition