Logo and some fine tuning