fixing a few bugs
abandoning underscore naming scheme