Some fixes to 7.1

Struct defined in .cpp now, tempList deleted now.