tunk tunk cosmetic fixes
fix small bugs introduced by previous fixes