couple more changes, trying to fix bug