more basics and cleanup