Added corner stuff to make other things easier