fixed bugs, minor updates to names