tiny fixes according to input from FlashYoshi