Some cleanups, started adding a logo