followup checkbox and general cleanup