Changes in logo; some fixes here and there