various structural fixes and logo