moved elements, cleaned up old comments