fixed problems that turned out to be in never-used code, oh well