fix pragma once, clean out bad methods
rename and added list pieces