minor cleanup
minor changes, still has freeze issues