Various touchups & fixes