Minor clean ups all around