Making further fixes and addin favicon