generic fixes, aesthetics updated