logo additions and code cleanup