some cleanup and blocking things in