some codechanges and cleanings.